Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 2 Feb 2012 22:03:14 +0000 (14:03 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 2 Feb 2012 22:03:14 +0000 (14:03 -0800)

Trivial merge